[qemu patches] Update patches upto changeset 15040:090ca10cb543.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --git a/tools/ioemu/patches/domain-timeoffset b/tools/ioemu/patches/domain-timeoffset
index 0b5b9808d2d21f113362660d05884e781681bd4b..f58057ab8016401e80d14164b95ebb34a2dc1d36 100644 (file)
--- a/tools/ioemu/patches/domain-timeoffset
+++ b/tools/ioemu/patches/domain-timeoffset
@@ -1,7 +1,7 @@
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2007-05-10 16:04:24.000000000 +0100
-+++ ioemu/vl.c 2007-05-10 16:04:24.000000000 +0100
+--- ioemu.orig/vl.c    2007-05-11 10:04:50.000000000 +0100
++++ ioemu/vl.c 2007-05-11 10:04:50.000000000 +0100
 @@ -7530,6 +7530,9 @@
      }
      free(page_array);
@@ -14,8 +14,8 @@ Index: ioemu/vl.c
      phys_ram_base = qemu_vmalloc(phys_ram_size);
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2007-05-10 16:04:24.000000000 +0100
-+++ ioemu/vl.h 2007-05-10 16:04:24.000000000 +0100
+--- ioemu.orig/vl.h    2007-05-11 10:04:50.000000000 +0100
++++ ioemu/vl.h 2007-05-11 10:04:50.000000000 +0100
 @@ -1433,6 +1433,10 @@
  int xenstore_vm_write(int domid, char *key, char *val);
  char *xenstore_vm_read(int domid, char *key, int *len);
@@ -29,8 +29,8 @@ Index: ioemu/vl.h
  extern char domain_name[];
 Index: ioemu/target-i386-dm/helper2.c
 ===================================================================
---- ioemu.orig/target-i386-dm/helper2.c        2007-05-10 16:04:22.000000000 +0100
-+++ ioemu/target-i386-dm/helper2.c     2007-05-10 16:04:24.000000000 +0100
+--- ioemu.orig/target-i386-dm/helper2.c        2007-05-11 10:04:48.000000000 +0100
++++ ioemu/target-i386-dm/helper2.c     2007-05-11 10:04:50.000000000 +0100
 @@ -74,6 +74,8 @@
  
  int xc_handle;

diff --git a/tools/ioemu/patches/ioemu-ia64 b/tools/ioemu/patches/ioemu-ia64
index 02017dc3989c92fd3c0a866d8a09991a6cca011c..bfa8bd72671970d8b8ce4eed9efb18411ba633e3 100644 (file)
--- a/tools/ioemu/patches/ioemu-ia64
+++ b/tools/ioemu/patches/ioemu-ia64
@@ -1,7 +1,7 @@
 Index: ioemu/hw/iommu.c
 ===================================================================
---- ioemu.orig/hw/iommu.c      2007-05-10 15:49:26.000000000 +0100
-+++ ioemu/hw/iommu.c   2007-05-10 15:49:53.000000000 +0100
+--- ioemu.orig/hw/iommu.c      2007-05-11 10:00:33.000000000 +0100
++++ ioemu/hw/iommu.c   2007-05-11 10:01:09.000000000 +0100
 @@ -82,7 +82,11 @@
  #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
  #define IOPTE_WAZ           0x00000001 /* Write as zeros */
@@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
  
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2007-05-10 15:49:53.000000000 +0100
-+++ ioemu/vl.c 2007-05-10 15:54:48.000000000 +0100
+--- ioemu.orig/vl.c    2007-05-11 10:01:09.000000000 +0100
++++ ioemu/vl.c 2007-05-11 10:01:09.000000000 +0100
 @@ -7149,6 +7149,11 @@
      }
  #endif
@@ -77,8 +77,8 @@ Index: ioemu/vl.c
      phys_ram_base = qemu_vmalloc(phys_ram_size);
 Index: ioemu/target-i386-dm/cpu.h
 ===================================================================
---- ioemu.orig/target-i386-dm/cpu.h    2007-05-10 15:49:26.000000000 +0100
-+++ ioemu/target-i386-dm/cpu.h 2007-05-10 15:54:46.000000000 +0100
+--- ioemu.orig/target-i386-dm/cpu.h    2007-05-11 10:01:09.000000000 +0100
++++ ioemu/target-i386-dm/cpu.h 2007-05-11 10:01:09.000000000 +0100
 @@ -78,7 +78,11 @@
  /* helper2.c */
  int main_loop(void);

diff --git a/tools/ioemu/patches/ioemu-save-restore-logdirty b/tools/ioemu/patches/ioemu-save-restore-logdirty
index 627629051e03234a6121d0a87ef0a177b3f795db..741e4feea1509edbd6a14537fc7861d496af4513 100644 (file)
--- a/tools/ioemu/patches/ioemu-save-restore-logdirty
+++ b/tools/ioemu/patches/ioemu-save-restore-logdirty
@@ -1,7 +1,7 @@
 Index: ioemu/xenstore.c
 ===================================================================
---- ioemu.orig/xenstore.c      2007-05-03 20:38:53.000000000 +0100
-+++ ioemu/xenstore.c   2007-05-03 20:49:57.000000000 +0100
+--- ioemu.orig/xenstore.c      2007-05-11 10:04:51.000000000 +0100
++++ ioemu/xenstore.c   2007-05-11 10:04:52.000000000 +0100
 @@ -11,6 +11,11 @@
  #include "vl.h"
  #include "block_int.h"
@@ -155,9 +155,9 @@ Index: ioemu/xenstore.c
          goto out;
 Index: ioemu/target-i386-dm/exec-dm.c
 ===================================================================
---- ioemu.orig/target-i386-dm/exec-dm.c        2007-05-03 20:49:54.000000000 +0100
-+++ ioemu/target-i386-dm/exec-dm.c     2007-05-03 20:49:57.000000000 +0100
-@@ -431,6 +431,9 @@
+--- ioemu.orig/target-i386-dm/exec-dm.c        2007-05-11 10:04:52.000000000 +0100
++++ ioemu/target-i386-dm/exec-dm.c     2007-05-11 10:04:52.000000000 +0100
+@@ -436,6 +436,9 @@
  #define phys_ram_addr(x) ((addr < ram_size) ? (phys_ram_base + (x)) : NULL)
  #endif
  
@@ -167,7 +167,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
                              int len, int is_write)
  {
-@@ -466,8 +469,19 @@
+@@ -471,8 +474,19 @@
                      l = 1;
                  }
              } else if ((ptr = phys_ram_addr(addr)) != NULL) {

diff --git a/tools/ioemu/patches/qemu-dm b/tools/ioemu/patches/qemu-dm
index b962593ad62a5af56ec4ab1006eb563d6d539c39..6f668038558b2242136632eb4abe3411350a4283 100644 (file)
--- a/tools/ioemu/patches/qemu-dm
+++ b/tools/ioemu/patches/qemu-dm
@@ -1,7 +1,7 @@
 Index: ioemu/Makefile.target
 ===================================================================
---- ioemu.orig/Makefile.target 2007-05-10 15:36:06.000000000 +0100
-+++ ioemu/Makefile.target      2007-05-10 15:56:20.000000000 +0100
+--- ioemu.orig/Makefile.target 2007-05-10 16:22:45.000000000 +0100
++++ ioemu/Makefile.target      2007-05-11 10:00:33.000000000 +0100
 @@ -332,7 +332,7 @@
  endif
  
@@ -13,8 +13,8 @@ Index: ioemu/Makefile.target
  VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-qcow2.o
 Index: ioemu/configure
 ===================================================================
---- ioemu.orig/configure       2007-05-10 15:36:06.000000000 +0100
-+++ ioemu/configure    2007-05-10 15:56:20.000000000 +0100
+--- ioemu.orig/configure       2007-05-10 16:22:45.000000000 +0100
++++ ioemu/configure    2007-05-11 10:00:33.000000000 +0100
 @@ -77,8 +77,8 @@
  bigendian="no"
  mingw32="no"
@@ -37,8 +37,8 @@ Index: ioemu/configure
    target_user_only="yes"
 Index: ioemu/cpu-all.h
 ===================================================================
---- ioemu.orig/cpu-all.h       2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/cpu-all.h    2007-05-10 15:56:20.000000000 +0100
+--- ioemu.orig/cpu-all.h       2007-05-10 16:22:44.000000000 +0100
++++ ioemu/cpu-all.h    2007-05-11 10:00:33.000000000 +0100
 @@ -690,7 +690,9 @@
  void page_set_flags(target_ulong start, target_ulong end, int flags);
  void page_unprotect_range(target_ulong data, target_ulong data_size);
@@ -64,8 +64,8 @@ Index: ioemu/cpu-all.h
  void cpu_dump_state(CPUState *env, FILE *f, 
 Index: ioemu/disas.h
 ===================================================================
---- ioemu.orig/disas.h 2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/disas.h      2007-05-10 15:36:06.000000000 +0100
+--- ioemu.orig/disas.h 2007-05-10 16:22:44.000000000 +0100
++++ ioemu/disas.h      2007-05-10 16:22:45.000000000 +0100
 @@ -1,6 +1,7 @@
  #ifndef _QEMU_DISAS_H
  #define _QEMU_DISAS_H
@@ -83,25 +83,9 @@ Index: ioemu/disas.h
  #endif /* _QEMU_DISAS_H */
 Index: ioemu/exec-all.h
 ===================================================================
---- ioemu.orig/exec-all.h      2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/exec-all.h   2007-05-10 15:56:40.000000000 +0100
-@@ -357,6 +357,7 @@
- extern CPUReadMemoryFunc *io_mem_read[IO_MEM_NB_ENTRIES][4];
- extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
- 
-+#ifndef CONFIG_DM
- #ifdef __powerpc__
- static inline int testandset (int *p)
- {
-@@ -480,6 +481,7 @@
-     return __sync_lock_test_and_set (p, 1);
- }
- #endif
-+#endif /* !CONFIG_DM */
- 
- typedef int spinlock_t;
- 
-@@ -519,7 +521,7 @@
+--- ioemu.orig/exec-all.h      2007-05-10 16:22:44.000000000 +0100
++++ ioemu/exec-all.h   2007-05-11 10:00:54.000000000 +0100
+@@ -519,7 +519,7 @@
  
  extern int tb_invalidated_flag;
  
@@ -110,7 +94,7 @@ Index: ioemu/exec-all.h
  
  void tlb_fill(target_ulong addr, int is_write, int is_user, 
                void *retaddr);
-@@ -546,7 +548,7 @@
+@@ -546,7 +546,7 @@
  
  #endif
  
@@ -121,8 +105,8 @@ Index: ioemu/exec-all.h
      return addr;
 Index: ioemu/hw/pc.c
 ===================================================================
---- ioemu.orig/hw/pc.c 2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/hw/pc.c      2007-05-10 15:56:20.000000000 +0100
+--- ioemu.orig/hw/pc.c 2007-05-10 16:22:44.000000000 +0100
++++ ioemu/hw/pc.c      2007-05-11 10:00:33.000000000 +0100
 @@ -74,6 +74,7 @@
      }
  }
@@ -184,8 +168,8 @@ Index: ioemu/hw/pc.c
          if (serial_hds[i]) {
 Index: ioemu/hw/vga_int.h
 ===================================================================
---- ioemu.orig/hw/vga_int.h    2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/hw/vga_int.h 2007-05-10 15:56:19.000000000 +0100
+--- ioemu.orig/hw/vga_int.h    2007-05-10 16:22:44.000000000 +0100
++++ ioemu/hw/vga_int.h 2007-05-11 10:00:32.000000000 +0100
 @@ -28,7 +28,7 @@
  #define ST01_DISP_ENABLE    0x01
  
@@ -197,8 +181,8 @@ Index: ioemu/hw/vga_int.h
  #define VBE_DISPI_MAX_YRES              1200
 Index: ioemu/monitor.c
 ===================================================================
---- ioemu.orig/monitor.c       2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/monitor.c    2007-05-10 15:56:20.000000000 +0100
+--- ioemu.orig/monitor.c       2007-05-10 16:22:44.000000000 +0100
++++ ioemu/monitor.c    2007-05-11 10:00:33.000000000 +0100
 @@ -69,6 +69,12 @@
  
  void term_flush(void)
@@ -440,8 +424,8 @@ Index: ioemu/monitor.c
  {
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2007-05-10 15:36:04.000000000 +0100
-+++ ioemu/vl.c 2007-05-10 15:56:20.000000000 +0100
+--- ioemu.orig/vl.c    2007-05-10 16:22:44.000000000 +0100
++++ ioemu/vl.c 2007-05-11 10:00:33.000000000 +0100
 @@ -396,12 +396,15 @@
  void hw_error(const char *fmt, ...)
  {

diff --git a/tools/ioemu/patches/qemu-target-i386-dm b/tools/ioemu/patches/qemu-target-i386-dm
index d5ced253ff5d8065950ca2c1439f4af007e13d05..77074d31149ff5b5369e9aaefb8eaad76ed90462 100644 (file)
--- a/tools/ioemu/patches/qemu-target-i386-dm
+++ b/tools/ioemu/patches/qemu-target-i386-dm
@@ -1,7 +1,7 @@
 Index: ioemu/Makefile.target
 ===================================================================
---- ioemu.orig/Makefile.target 2007-05-09 14:08:42.000000000 +0100
-+++ ioemu/Makefile.target      2007-05-09 14:09:10.000000000 +0100
+--- ioemu.orig/Makefile.target 2007-05-11 10:00:33.000000000 +0100
++++ ioemu/Makefile.target      2007-05-11 10:04:05.000000000 +0100
 @@ -65,6 +65,8 @@
  QEMU_SYSTEM=qemu-fast
  endif
@@ -32,8 +32,8 @@ Index: ioemu/Makefile.target
  CPPFLAGS += -DHAS_AUDIO
 Index: ioemu/configure
 ===================================================================
---- ioemu.orig/configure       2007-05-09 14:08:42.000000000 +0100
-+++ ioemu/configure    2007-05-09 14:09:10.000000000 +0100
+--- ioemu.orig/configure       2007-05-11 10:00:33.000000000 +0100
++++ ioemu/configure    2007-05-11 10:04:04.000000000 +0100
 @@ -426,6 +426,8 @@
      if [ "$darwin_user" = "yes" ] ; then
          target_list="i386-darwin-user ppc-darwin-user $target_list"
@@ -45,8 +45,8 @@ Index: ioemu/configure
  fi
 Index: ioemu/monitor.c
 ===================================================================
---- ioemu.orig/monitor.c       2007-05-09 14:08:59.000000000 +0100
-+++ ioemu/monitor.c    2007-05-09 14:09:10.000000000 +0100
+--- ioemu.orig/monitor.c       2007-05-11 10:00:33.000000000 +0100
++++ ioemu/monitor.c    2007-05-11 10:04:06.000000000 +0100
 @@ -1325,6 +1325,10 @@
        "", "show which guest mouse is receiving events" },
      { "vnc", "", do_info_vnc,
@@ -60,8 +60,8 @@ Index: ioemu/monitor.c
  
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2007-05-09 14:08:42.000000000 +0100
-+++ ioemu/vl.c 2007-05-09 14:09:10.000000000 +0100
+--- ioemu.orig/vl.c    2007-05-11 10:00:33.000000000 +0100
++++ ioemu/vl.c 2007-05-11 10:04:06.000000000 +0100
 @@ -88,7 +88,7 @@
  
  #include "exec-all.h"
@@ -98,8 +98,8 @@ Index: ioemu/vl.c
  {
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2007-05-09 14:08:42.000000000 +0100
-+++ ioemu/vl.h 2007-05-09 14:09:10.000000000 +0100
+--- ioemu.orig/vl.h    2007-05-11 10:00:33.000000000 +0100
++++ ioemu/vl.h 2007-05-11 10:04:06.000000000 +0100
 @@ -37,6 +37,8 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -132,7 +132,7 @@ Index: ioemu/vl.h
 Index: ioemu/target-i386-dm/cpu.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/target-i386-dm/cpu.h 2007-05-09 14:09:10.000000000 +0100
++++ ioemu/target-i386-dm/cpu.h 2007-05-11 10:04:06.000000000 +0100
 @@ -0,0 +1,84 @@
 +/*
 + * i386 virtual CPU header
@@ -221,8 +221,8 @@ Index: ioemu/target-i386-dm/cpu.h
 Index: ioemu/target-i386-dm/exec-dm.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/target-i386-dm/exec-dm.c     2007-05-09 14:09:10.000000000 +0100
-@@ -0,0 +1,540 @@
++++ ioemu/target-i386-dm/exec-dm.c     2007-05-11 10:04:04.000000000 +0100
+@@ -0,0 +1,545 @@
 +/*
 + *  virtual page mapping and translated block handling
 + * 
@@ -569,6 +569,11 @@ Index: ioemu/target-i386-dm/exec-dm.c
 +}
 +
 +#ifdef __ia64__
++
++#define __ia64_fc(addr)       asm volatile ("fc %0" :: "r"(addr) : "memory")
++#define ia64_sync_i() asm volatile (";; sync.i" ::: "memory")
++#define ia64_srlz_i() asm volatile (";; srlz.i ;;" ::: "memory")
++
 +/* IA64 has seperate I/D cache, with coherence maintained by DMA controller.
 + * So to emulate right behavior that guest OS is assumed, we need to flush
 + * I/D cache here.
@@ -766,7 +771,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
 Index: ioemu/target-i386-dm/helper2.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/target-i386-dm/helper2.c     2007-05-09 14:09:10.000000000 +0100
++++ ioemu/target-i386-dm/helper2.c     2007-05-11 10:04:05.000000000 +0100
 @@ -0,0 +1,542 @@
 +/*
 + *  i386 helpers (without register variable usage)
@@ -1313,7 +1318,7 @@ Index: ioemu/target-i386-dm/helper2.c
 Index: ioemu/target-i386-dm/i8259-dm.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/target-i386-dm/i8259-dm.c    2007-05-09 14:09:10.000000000 +0100
++++ ioemu/target-i386-dm/i8259-dm.c    2007-05-11 10:04:04.000000000 +0100
 @@ -0,0 +1,67 @@
 +/* Xen 8259 stub for interrupt controller emulation
 + * 
@@ -1385,7 +1390,7 @@ Index: ioemu/target-i386-dm/i8259-dm.c
 Index: ioemu/target-i386-dm/qemu-dm.debug
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/target-i386-dm/qemu-dm.debug 2007-05-09 14:09:10.000000000 +0100
++++ ioemu/target-i386-dm/qemu-dm.debug 2007-05-11 10:01:09.000000000 +0100
 @@ -0,0 +1,10 @@
 +#!/bin/sh
 +
@@ -1400,7 +1405,7 @@ Index: ioemu/target-i386-dm/qemu-dm.debug
 Index: ioemu/target-i386-dm/qemu-ifup
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/target-i386-dm/qemu-ifup     2007-05-09 14:09:10.000000000 +0100
++++ ioemu/target-i386-dm/qemu-ifup     2007-05-11 10:01:09.000000000 +0100
 @@ -0,0 +1,9 @@
 +#!/bin/sh
 +

diff --git a/tools/ioemu/patches/xen-mapcache b/tools/ioemu/patches/xen-mapcache
index 8cb21fa3cfa5eea502e483b8fe836c63f41c98bd..44f493175fa354119296bed9f00fc054a64fe540 100644 (file)
--- a/tools/ioemu/patches/xen-mapcache
+++ b/tools/ioemu/patches/xen-mapcache
@@ -17,8 +17,8 @@ Signed-off-by: Keir Fraser <keir@xensource.com>
 
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2007-05-10 15:35:25.000000000 +0100
-+++ ioemu/vl.c 2007-05-10 15:35:25.000000000 +0100
+--- ioemu.orig/vl.c    2007-05-11 10:04:51.000000000 +0100
++++ ioemu/vl.c 2007-05-11 10:04:52.000000000 +0100
 @@ -275,7 +275,7 @@
      for(i = start; i < start + length; i += size) {
          ioport_read_table[bsize][i] = func;
@@ -260,8 +260,8 @@ Index: ioemu/vl.c
      nr_pages = ram_size/PAGE_SIZE;
 Index: ioemu/target-i386-dm/exec-dm.c
 ===================================================================
---- ioemu.orig/target-i386-dm/exec-dm.c        2007-05-10 15:32:53.000000000 +0100
-+++ ioemu/target-i386-dm/exec-dm.c     2007-05-10 15:35:25.000000000 +0100
+--- ioemu.orig/target-i386-dm/exec-dm.c        2007-05-11 10:04:46.000000000 +0100
++++ ioemu/target-i386-dm/exec-dm.c     2007-05-11 10:04:52.000000000 +0100
 @@ -36,6 +36,7 @@
  
  #include "cpu.h"
@@ -303,7 +303,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  }
  
  /* enable or disable low levels log */
-@@ -409,16 +425,11 @@
+@@ -414,16 +430,11 @@
          return 0;
  }
  
@@ -324,7 +324,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  
  void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
                              int len, int is_write)
-@@ -426,13 +437,15 @@
+@@ -431,13 +442,15 @@
      int l, io_index;
      uint8_t *ptr;
      uint32_t val;
@@ -342,7 +342,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
          io_index = iomem_index(addr);
          if (is_write) {
              if (io_index) {
-@@ -452,11 +465,11 @@
+@@ -457,11 +470,11 @@
                      io_mem_write[io_index][0](io_mem_opaque[io_index], addr, val);
                      l = 1;
                  }
@@ -357,7 +357,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  #endif 
              }
          } else {
-@@ -477,9 +490,9 @@
+@@ -482,9 +495,9 @@
                      stb_raw(buf, val);
                      l = 1;
                  }
@@ -369,7 +369,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
              } else {
                  /* Neither RAM nor known MMIO space */
                  memset(buf, 0xff, len); 
-@@ -489,6 +502,8 @@
+@@ -494,6 +507,8 @@
          buf += l;
          addr += l;
      }
@@ -380,8 +380,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
  
 Index: ioemu/vl.h
 ===================================================================
---- ioemu.orig/vl.h    2007-05-10 15:35:25.000000000 +0100
-+++ ioemu/vl.h 2007-05-10 15:35:25.000000000 +0100
+--- ioemu.orig/vl.h    2007-05-11 10:04:51.000000000 +0100
++++ ioemu/vl.h 2007-05-11 10:04:52.000000000 +0100
 @@ -159,6 +159,28 @@
  
  extern FILE *logfile;
@@ -413,8 +413,8 @@ Index: ioemu/vl.h
  
 Index: ioemu/target-i386-dm/cpu.h
 ===================================================================
---- ioemu.orig/target-i386-dm/cpu.h    2007-05-10 15:32:53.000000000 +0100
-+++ ioemu/target-i386-dm/cpu.h 2007-05-10 15:35:25.000000000 +0100
+--- ioemu.orig/target-i386-dm/cpu.h    2007-05-11 10:04:47.000000000 +0100
++++ ioemu/target-i386-dm/cpu.h 2007-05-11 10:04:52.000000000 +0100
 @@ -25,7 +25,8 @@
  #ifdef TARGET_X86_64
  #define TARGET_LONG_BITS 64
@@ -427,8 +427,8 @@ Index: ioemu/target-i386-dm/cpu.h
  /* target supports implicit self modifying code */
 Index: ioemu/target-i386-dm/helper2.c
 ===================================================================
---- ioemu.orig/target-i386-dm/helper2.c        2007-05-10 15:34:24.000000000 +0100
-+++ ioemu/target-i386-dm/helper2.c     2007-05-10 15:35:25.000000000 +0100
+--- ioemu.orig/target-i386-dm/helper2.c        2007-05-11 10:04:50.000000000 +0100
++++ ioemu/target-i386-dm/helper2.c     2007-05-11 10:04:52.000000000 +0100
 @@ -526,6 +526,9 @@
      case IOREQ_TYPE_TIMEOFFSET:
          cpu_ioreq_timeoffset(env, req);